NXP-12312: fix virtual columns returned from JOIN
NXP-13334: fix qualifier-related query issues