Merge pull request #927 from faizkhan00/database-staging

Comments added to genQs
Fix accepts