Fix bugs in --rerank-features handling