Make API a bit more consistent
Disable autocomplete