Added handling of multiple value for single query parameters