MT#4213 Don't search for contract id twice.

The result set is already complex enough :)