Fix some bugs in entity property editor