Migrate electricity normalized

Also prepare to remove URL encoding from messages (issue #211)