SQLForm for comments

cleanup
Merge pull request #1017 from hitesh96db/fixes

SQLForm for comments