Added filter but not really working