Fixed issue with blank query strings