Fixing the filter pushdown for 'and' and 'or' queries