Fix search messaging bug