Add support for template variables to remove_query_param