Add unwatch script
Fix full name unwatch issue