Patch proposal fro org-capture-fill-template

Hope it's useful.

Thanks.