Made some updates to PolygonSearch