Added filters and searches