- Fix Entities edit errors
