strengthened the parameter/value replacement in getQuery()

prevents similarly named parameters from replacing when they shouldn't
(e.g., :country and :country_other)