fixed bugs related to active/inactive entity syncing