fix to the data backend to comply with better queries