Fixing the issue with hru selection on the map (partially)