[FIX] Put a warning message for pre-bookings

- closes #1338
- post-wip improvements