Lps 33611 Improve SampleSQLBuilder to support requirements of web content test.