Use expression in attributes
Fix text diagram