Changed all ID's to combo's with the values associated