allows for more criteria's to be used - we might need to reimplement the service at some point ...