Added in searches, 'stop viewing' now an issue