merged in -mode and -tagexpr support