Fixed some un-necessary db updating
Merge remote-tracking branch 'origin/master'
Added sort functionality