Adding component-query support with qwery fallback.