S61933 clear link on the owner filter; also refactored to put creation of owner filter into its own function.