Also need to set restriction at cell level

Change-Id: I4db64e1d431fc1a4dc52161591361615b2d6bdfc