Remove size as a param, add to query