diff --git a/res/queries/python/textobjects/cell.scm b/res/queries/python/textobjects/cell.scm
index dcf77dc..8c11cf0 100644
--- a/res/queries/python/textobjects/cell.scm
+++ b/res/queries/python/textobjects/cell.scm
@@ -1,52 +1,44 @@
+
 ;; inherits: python
 ;; extends
 
 ; vanilla script, without separator
 (module
   .
-  (_) @_nonseparator @_start @_end
-  .
-  (_)* @_nonseparator @_end
+  (_)+ @cell
   .
-  (#match-cell-content? @_nonseparator)
-  (#make-range! "cell" @_start @_end)
+  (#match-cell-content? @cell)
 )
 
 ; first cell, follow a separator
 (module
   .
-  (_) @_nonseparator @_start @_end
-  .
-  (_)* @_nonseparator @_end
+  _+ @cell
   .
   (comment) @_cellseparator
-  (#match-cell-content? @_nonseparator)
+  (#match-cell-content? @cell)
   (#match-percent-separator? @_cellseparator)
-  (#make-range! "cell" @_start @_end)
 )
 
 ; cell between two separator
 (module
-  (comment) @_cellseparator @_start 
-  .
-  (_)+ @_nonseparator @_end
-  .
-  (comment) @_cellseparator
-  (#match-cell-content? @_nonseparator)
-  (#match-percent-separator? @_cellseparator)
-  (#make-range! "cell" @_start @_end)
+    (comment) @_cellseparator @cell
+    (_)* @_cellcontent @cell
+    (comment) @_cellseparator
+    (#match-cell-content? @_cellcontent)
+    (#match-percent-separator? @_cellseparator)
 )
 
 
 ; latest cell after separator
 (module
-  (comment) @_cellseparator @_start
-  .
-  (_) @_nonseparator @_end
-  (_)* @_nonseparator @_end
-  .
-  (#match-cell-content? @_nonseparator)
-  (#match-percent-separator? @_cellseparator)
-  (#make-range! "cell" @_start @_end)
+  (
+    (comment) @_cellseparator @cell
+    (_)* @_cellcontent @cell
+    .
+    (#match-cell-content? @_cellcontent)
+    (#match-percent-separator? @_cellseparator)
+  )
 )
 
+
diff --git a/res/queries/python/textobjects/cellcontent.scm b/res/queries/python/textobjects/cellcontent.scm
index 99d362a..1a8876f 100644
--- a/res/queries/python/textobjects/cellcontent.scm
+++ b/res/queries/python/textobjects/cellcontent.scm
@@ -4,38 +4,30 @@
 ; vanilla script, without separator
 (module
   .
-  (_) @_nonseparator @_start @_end
+  (_)+ @cellcontent
   .
-  (_)* @_nonseparator @_end
-  .
-  (#match-cell-content? @_nonseparator)
-  (#make-range! "cellcontent" @_start @_end)
+  (#match-cell-content? @cellcontent)
 )
 
 ; first cell, follow a separator
 (module
   .
-  (_) @_nonseparator @_start @_end
-  .
-  (_)* @_nonseparator @_end
+  _+ @cellcontent
   .
   (comment) @_cellseparator
-  (#match-cell-content? @_nonseparator)
+  (#match-cell-content? @cellcontent)
   (#match-percent-separator? @_cellseparator)
-  (#make-range! "cellcontent" @_start @_end)
 )
 
 ; cell between two separator
 (module
   (comment) @_cellseparator
   .
-  (_) @_nonseparator @_start @_end
-  (_)* @_nonseparator @_end
+  (_)+ @cellcontent
   .
   (comment) @_cellseparator
-  (#match-cell-content? @_nonseparator)
+  (#match-cell-content? @cellcontent)
   (#match-percent-separator? @_cellseparator)
-  (#make-range! "cellcontent" @_start @_end)
 )
 
 
@@ -43,11 +35,9 @@
 (module
   (comment) @_cellseparator
   .
-  (_) @_nonseparator @_start @_end
-  (_)* @_nonseparator @_end
+  _+ @cellcontent
   .
-  (#match-cell-content? @_nonseparator)
+  (#match-cell-content? @cellcontent)
   (#match-percent-separator? @_cellseparator)
-  (#make-range! "cellcontent" @_start @_end)
 )