merge in search plugin from development branch