improved query overlay