fixed explicit query string building