Minor code DRYup
Guard to avoid fetching shelf when not specified