improved counting to account for current booking properly