diff --git a/booking.py b/booking.py
index 79a884a..e05375f 100644
--- a/booking.py
+++ b/booking.py
@@ -1651,15 +1651,15 @@ class BookingStatusReport(Report):
             )
         records = Folio.search(dom, order=[('arrival_date', 'ASC')])
 
-        bookings = {}
-        if data['grouped']:
-            for fol in records:
-                bk = fol.booking
-                if bk not in bookings.keys():
-                    bookings[bk] = []
-                bookings[bk].append(fol)
-            records = bookings
-        report_context['records'] = records
+        _records = {}
+        for fol in records:
+            bk = fol.booking
+            if bk not in _records.keys():
+                _records[bk] = []
+            _records[bk].append(fol)
+
+        report_context['grouped'] = data['grouped']
+        report_context['records'] = _records
         report_context['company'] = Company(data['company'])
         return report_context
 
diff --git a/booking_status.fods b/booking_status.fods
index d4105a5..6ea1d98 100644
Binary files a/booking_status.fods and b/booking_status.fods differ
diff --git a/service.py b/service.py
index dd3b462..5cba9df 100644
--- a/service.py
+++ b/service.py
@@ -56,6 +56,7 @@ class Service(Workflow, ModelSQL, ModelView):
         ('checked', 'Checked'),
     ], 'State', readonly=True, states=STATES)
     state_string = state.translated('state')
+    space = fields.Many2One('analytic_account.space', 'Space', required=False)
     description = fields.Char('Description', select=True, states=STATES)
     count_services = fields.Function(fields.Integer('Count Services',
         select=True), 'get_count_services')
diff --git a/view/service_form.xml b/view/service_form.xml
index 1d7ba3f..ccb7d30 100644
--- a/view/service_form.xml
+++ b/view/service_form.xml
@@ -1,19 +1,21 @@
 <?xml version="1.0"?>
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
-<form>
+<form col="6">
     <label name="kind"/>
     <field name="kind" widget="selection"/>
+    <label name="company"/>
+    <field name="company"/>
     <label name="number"/>
     <field name="number"/>
     <label name="service_date"/>
     <field name="service_date"/>
-    <label name="company"/>
-    <field name="company"/>
+    <label name="space"/>
+    <field name="space" widget="selection"/>
     <label name="description"/>
     <field name="description"/>
-    <button name="open" string="Open" icon="tryton-forward" colspan="2"/>  
-    <field name="lines" colspan="4"
+    <!-- <button name="open" string="Open" icon="tryton-forward" colspan="2"/> -->
+    <field name="lines" colspan="6"
         view_ids="hotel.service_line_view_tree"/>
 
     <group col="5" colspan="4" id="buttons">