NWUKFS-383 (SB.1.9.3) *Fix sql