More work on service/defaultGraph selection