Fix extensions to work with category sort changes