Fixed a bug where all entity subclasses where using the default entity toString() value. Also fixed priority ordering