Removed OR queries again, just use annotation:xyz query