Map tracking enabled again for HC

- Map tracking should now work correctly for HC