Using Datastore as it should be
started to get rid of iterables
switch to filter