Latched onto changes in bbox and point
Added DWITHIN constraint