Changed filters to use attr_wrapper instead of hard-coded apostrophe.
Escaping attr_wrapper instead of hard-coded apostrophe.
Merge branch 'fixes'