[sprint 6] relation location save bug fixes