added more fields tp test dataset, filtering now works for multiple fields and multiple values