handle null rate and better searching