Fix bug with whitestar and out of order workflows that metadata-on exposes