Reservation filter and few fixes