Updates to decode comments in HomeConroller