LPS 50939 fix sample sql builder