Fixed bug echo query