Add combined rerank feature option; rename --rerank-instance -> --rerank-features