Taste is on my mind

Moved the peer ID generation outside of qurey server