Get rid of search parameters on 'View Map' link
Merge branch 'master' into wmplus