Fixes on collector

1. Fixes on DateTime range identification
2. Fixes on crashes