Use component/query to support fallbacks

The pull request also fixes the tests (adapts to changed domify)