entity sync issues resolved