Further tweaks to cite completion