Performance enhancements with env update/let shadowing
Fix regression, bindings missing filters.