Ends filtering added