Optimizations to loading search suggestions
Code cleanup