FIX: Support underscores in autocomplete widget