NXP-14013: More nxql to es operator impl