added contextual filtering and foundation for search