bug fix for unwatch in the wrong place, and restricts are now 'AE' to allow for elements