Minor improvements to ch 6 & 7

Changes to show  query criteria in update_or_insert and IS_IN_SET to force completion of checkbox