1. Allow 1000 samples for continuous collection
2. Fix a bug in continuous collection