Munge query string fields to support some special cases