NXP-12558: fix query with join and subquery
NXP-12642: fix query on multi-valued property IS NULL