Fixing format

- fixing output format
- adding count to each query