Fixed issue #39 and added enabled toggling of autocomplete values