added type parameter to returned Query object for builder methods