added db values of task types and subjects, updated sql