Changed order of indexer select query to use new index