Handle 6 and 7 digit ids