fixes 5310
fixes #5310 updated QueryTest and sample html file
make test method name more clear
Merge pull request #5360 in master
Merge pull request #5351 from steverhoades/hotfix/5310

fixes #5310
Merge branch 'hotfix/5351' into develop

Forward port #5351