Issue #20866: Fixed bugs and added filter to List