#5250 Refactor code for improving derivate search performance