stop querying on first match when using wildcards. Refs #466,#452

See #452