Fix range search