Fixed some bugs in the tube select