Fixing a couple issues in recent time range handling additions, inability to work against shapefiles with the timestamp flag support, and range merging logic issues