Added filters logic