Enhanced Citations gramplet

See and comment the PR #1180