Add a filter and correct format.