2. Check generation time over all possible time validity restriction forms
3. Clean up TPs removing {}
fix #0007298