Hazard viewer misc fixes

This PR includes code that extends the single curve function to distinguish single curves from mixed curves and add and remove them from the map accordingly.