Fix sorting

Fixed sorting with mappings.
Remember catagorical filter in popup