Updated - some selects do not work