Merge pull request #2117 from glassez/webui

WebUI Fixes
WebUI: Fix WebAPI returned data.