Bug Fix - More bug fixes and refactor of demographic dao - Trello 184

A couple of fixes for linking