fix some bugs
improve quicksearch query