Added filtering and search engine