Swapped to use component-query with qwery as fallback.