Add search controller and dosome refinements