Merge pull request #797 from leider/master

Fixing #731 by adding "query.smartmenus" component