DAR-2394 | BUG: Edit page broken