Fixed theme changing flickering. Fixed highlight queries. Fixed no results queries.