Support selectors that span over multiple elements in overlay component
Remove obsolete class field