LL-479
* added also the entities themselves to circles; not only the entity wrappers