Fix search by RPC