Some additional printing changes

Print query