Add option to enable auto-suggest