Added support for direct queries enter