update toggle/select handler to fix it!