Added support for new cases, query NO procedure