update TODOs
try to fix reservations interaction with duplication