Add basic (still rough) facility for watching items from the search lists, plus other tweaks