Fixes bug 888792 - Ensured backwards compatibility for plugin_type and h...

...ang_type in search.

r? @rhelmer or @peterbe