Choice of search method now available on command line.