FIXED: on the fly auto-completion