Annotator Tools: Fix major logic bug in code (RC)