Adding future look ahead window to the SQL trying to detect the current visitor
+ fixing small bug discovered (in the tests) as a result of this fix