Tidied up searching/highlighting