Ebremner/istwcms 4013 add meta tag fields redo

This should fix all the stuff that was wrong with old merge request. If this is fine, please close old merge request.