Small fixes on generic_autocomplete - fixes #27