Small changes to search, allowing multi field searches to be carried out. Need to make Lucene case insensitive and perhaps generalize  the initial search code?