Search sort indexing fixes