Fixed toolSwitch issue with move and zoom tool