[0564] Updated previous pull request

* Removed change of bounding_radius: if needed, this must be handled
core side
* changed some DELETE/INSERT to UPDATE queries