Added better search to quick search