Changes to Fix underlying KiraDb queries to return all items, not a subset