Handle lack of additional results better
Added result counter; Code cleanup