Updated selection rules for table assignments