Quick search improvement, references #129