Reworked env-regex-filter a bit