Added "I:" prefix for incident layers