Fix error with named services when fetching one service.
Fix error with named services when fetching one service.

joshkh/staircase,yochannah/staircase,yochannah/staircase,yochannah/staircase,joshkh/staircase,joshkh/staircase