Improvements to force Hospital IDs to be unique