tidy up, Db select/update consistency