BF: Some changes to search_indexes to get ordering to work, hopefully