Added URL splitter & formatter
Added search functionality to notfound
Minor cleanup
Minor cleanup
Changes the way country is tested in UK and Canada.
Merge pull request #3394 from deadlybutter/search404

Integrates preliminary 404 search functionality
Merge pull request #3395 from sergii-tkachenko/fix-uk-canada-tests

Changes the way country is tested in UK and Canada.