Attr_wrapper related fixes

I have changed filters and attribute escaping to user attr_wrapper instead of hard-coded apostrophe.
The first change is simply aesthetic, the latter was made, because the attributes were broken, when a double quotation mark (") appeared in them and single quotes were unnecessarily escaped when using double quote as attr_wrapper.