updated parsing and querying V0.0.2