added filtering by custom fields