Fixing expensive unneccessary datastore requests