Renaming and other house keeping
Fix URI handling
Set unique alert keys