fix for design flaw in query builder