Fix query string construction encoding
Clean up
Remove other searches apart from Recipient
Add country faceting to search