Remove special case search index in query