REST: Improve initial value logic