#160 Fix search