Changed Querys and added QueryResult