Fix dynamic id handling