[service] - set type from autocomplete, fixes for organisations