Prevent GeometryCollection from being indexed

Auditors: blackmad
Polygon index bug fix

Auditors: blackmad