Remove duplication of data
Add filters