Removed commented-out bbox facet as this is less likely to get back in now the polygon geometry search exists.