Autocomplete plus fix for issue #36