[enh] Query optimisation
[fix] don't amend an already published commit...