Added component-query with qwery as fallback.