Fixed Search schenarios and removed unneaded search fields - JH
Merge branch 'master' of https://github.com/cen4010-onlinecardealer/www