Fixes Zone #contains? n+1 query performance.

Fixes #4832