Fix legend service for [#909]