Fix the autocompletion field to send the right keyword instead of some representation of it