finished restructuration of queryObject and analysis view.