Minor cleanup
Fix highlighting wrapping around map