+ optimization (removing cycle on cells with default attributes)

Change-Id: I4441fab13cb8ba6251d8524db4045e22514436fa