Closes #655 - correct unordered_map to use std::string instead of char*

Old code use of char* failed as std was likely using pointer address instead of actual string

Closes #655 (closed)