Updated filter

Generalising the Datastore name, and adding in the comment/question line