Fixed data query inconsistencies