added filter and search. functionality not yet