Dollar-sign replacement in query_vars will now work inside strings as well