Updated filter to be on all columns