Convert link and text to use hstore based resource
Fix