Fixes issue with alert name change.

Also protects site name from entity values, like &.