Roni | BSHR-96 | Location level columns saved