better timeouts handling; less ip address in one job
Merge pull request #836 from andrzej-jankowski/prescan_fixes

Scan - prescan fixes