mapping clean up highlight fixes