Plugin Search fixes