updated entity editor helper