GUI-929
cleaned up other refs that didn't filter by owner