Fixed relations caught by dev toolbar
Merge pull request #46 from CoBase/entity-fixes

Fixed relations caught by dev toolbar