Fix possible wrong tag close
Set isConnected watch to right order