Working on Querysystem