more fixes to habtitat db
Merge branch 'develop'