refactored override tags to fix issue with empty environment in instance...

... name