fixing selects and checks