Fix wrong database field name + comments