update search token fields, change show all map text
Merge branch 'space/13.2' of github.com:OpenNMS/opennms into space/13.2