Some more small changes in filter sort order to enhance mysql cache query

Some more small changes in filter sort order to enhance mysql cache query