Additional plugins. Mappings cleanup.
Clear search mapping restored