tidied up quick search