[FIX] Temporary fix of element edit/add