Fixed issue with edit id