Fix issue when reversing a search.
Prepare for RC2.