use `return` instead of `return-fields` in searcher.rb
use CGI.escape in searcher.rb query preparation