adding additional fillvalue handling to ugrid module as well