add filter to both builder and non-builder env