Rework 2D query responder for imported format data