Solved Issue #17: Unknown Field 'd.department_id'

This issue was caused by a misspelling on the table in the database
Merge remote-tracking branch 'origin/Fixes' into Security