Move character map comments to separate line
Add mapping for ensuring highlight on search