Added more search indexes to improve long-tail query performance