Fix 745 by improving the draw_annotations() block drawing algo