Another version of AutocompleteQueryOptions

and junit tests