Fix bugs

Fix bugs in routing from filter view (issue # 1) and filtering by
individual countries (issue #2)