clean up MeshQueryWorker + more codable