refactor form makeReservationBySpace
Merge origin/master