Bug fixes for handling the dictionary returned by the web service