v.21.7Bug Fix

Fix WHERE Condition in Query Plan Optimization

Fix lost WHERE condition in expression-push-down optimization of query plan (setting query_plan_filter_push_down = 1 by default). Fixes #25368. #25370 (Nikolai Kochetov).