Allowing for an as-needed no-query fallback