Improved search with "and", partial match U4-2509

- added partial matching on each word.
- fixed bug so 'all' words match rather than 'any' words.