Fix eureka-first for context hierarchy