Improve attribute text support, using block