Added filter functionality/search/date/type