nir/serach: Increase maximum commutative expressions from 4 to 8