Revert
Conflict with self
Fix loc area html issue