Merge "Fix audio structure tags"