Add availability for choosing which datastore to filter on