JAL-2481 JAL-2593 JAL-2526 further optimisation of feature/index finding