Improve query string handling for CloudFront