control id fixes