Reranking bug fixes

1. Control bug fix
2. Algorithm bug fix