Quick find improvements, fixes #261