Some bugfixes related to not sanitizing IDs correctly, which led to white space in the IDs