Make closing search controller driven
Simplify showing/hiding results