Added support for searching in the container name and filtering on container type from the container page.