Added functionality for handling resolved questions