Add promote/demote case for CountRange
Fix -or filter constructor. Add annotations.