Move SearchHandler to package controller.