Fixed @mnewmedia's bug and added Some DB indexes
Merge remote-tracking branch 'origin/work' into work