NXP-14013: More fix, getting close to nxql page provider