add env and loc filter