Fixed bug that limited search results.  Enforcing timeout (default 2 seconds)

Reformatted.