Fixes tests
Use component/query to support fallbacks
Merge pull request #6 from manuelstofer/master

Use component/query to support fallbacks