code clean & rearrange, multiple words searchterms, improved usability etc.