fixed DATA query message to be able give correct response