Fix for organisation autocomplete