Added filtering by type and name.