added search plugin
code cleanup and formatting
added plugin to mapping
code cleanup and formatting