updated cucumber search feature
Merge branches 'master' and 'working'
updated cucumber tests