Search listener should merge conditions

Rather than overwrite any existing conditions
Merge pull request #53 from jippi/feature/search-listener-merge-conditions

Search listener should merge conditions