Added filter call for source/destination check