indentation fixes
support running without target-side tagger