Fix id search after rebase (Dialog)