special handling for do evaluation
fix tag handling