refactored search query handling
Merge pull request #198 from Financial-Times/stream-refactor

refactored search query handling