Fixed final submission and queue api