dokustream: fixed regex & cleanup