Some view refactoring for reservations