Make the CompositeEntitiesByKind component able to search for Kinds other than Entities

[widoz]

We want to make the kind searchable rather then presenting a predefined list.