fix for non-friendly query strings