Fixed reviewer tool search for both waffle states (bug 880678)