A line was moved to proper place.
Add a reminider to check a possible bug.
Fix a bug related to HRU_ID existing but not of expected type.