Removed final demand for ambient queries