Fix ID matching as ID's can contain "-" too