Simplify the response handler for search
Think this shouldn't be peeking into dep tree
Whitespace
Whitespace [tabs]
Partial revert
Merge pull request #177 from Financial-Times/simplify-and-sharpen

Simplify and sharpen