moved to more robust query builder