Some work on the quick search