Edit Ext ids needs some fixes