allow bigger auto-complete list
merge fix