fix for REV-632
fix for REV-636
fix for REV-617 and REV-635
standardize some more pagination info for flags and annotations