reverted PR attempt as it doesn't fix the ES filter bug