diff --git a/h5plexos/query/solution.py b/h5plexos/query/solution.py
index f83a5b4..e72c816 100644
--- a/h5plexos/query/solution.py
+++ b/h5plexos/query/solution.py
@@ -88,9 +88,9 @@ def _partial_query(*args, **kwargs):
     def query_object_property(
             self, object_class, prop,
             names=slice(None), categories=slice(None),
-            timescale="interval", timespan=slice(None), phase="ST"):
+            timescale="interval", timespan=slice(None), phase="ST", pluralize=True):
         
-        if ((0,6,0) <= self.version and self.version < (0,7,0)):
+        if ((0,6,0) <= self.version and self.version < (0,7,0)) and pluralize:
             object_class += "s"
         
         obj_lookup = self.objects[object_class].loc[(categories, names),].sort_values()