Removing additional query parameters and extraCriteria