Quick search improvement, fixes #129