improved admin stats by entity, fix #250