Updated dependent code based on previous changes to query processing.