(#1889) - more websql perf improvements