Fix for scope watches, commented out filters in list view for now