re-enable "ANNOTATE" functionality
support OR for ANNOTATE
better formatting