Fixed encoding/decoding issues with WebUI and IndexerAPI's
Merge remote-tracking branch 'origin/develop' into develop