adding some changes to search
pre-merge commit
merge conflict resolved between mike and miguel