[Source] Improve search performance