Remove useless mapping
Add highlight search