issue #31
issue #31
issue #32
update search controller