Merge pull request #573 from leider/master

admin list updates now working again for all situations
fixing crash if language in markup unknown