AI-438 : added expression to indicator definition