added filtering by environment