Make query bar better