Simplify computing entities without prior sync' activity
Factor code
fix typo