Fix carto value completion. Fixes #388