Fixed parsing of attributes with single quotes