i wonder if getQueryId should be a method on the baseQuery object. Then there is no need for query helper