Less db queries
Merge branch 'dev' of https://github.com/codeflash/codeflash into dev