Switch filter to terms, re: #1019
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master' into mapbaseurl