Extend spatial index to handle both location and containment