fix for query string variables