Improved handling of Citation and Correction