Added support for the no-query fallback