Fixed issues in Add Entity