Update core and searcher
Fix encoding