Use a query to determine if we need to fallback for +