#967 - Added fix on sorting issue on search with tags