Feature/zen 12224

correct the comments please. Also do we really need a separate get and query method? Is the get method used anywhere?