If kidney stones are a problem you'll have to address the liver eventually.
In the meantime drink distilled water the rest of your life and taking a shot of olive oil every day. Plus get the spine checked. There's probably a problem around T10-11 and upper cervical. Maybe even the pelvis.