*8910* Improved handling of review step tabs