Roni | BSHR-400 | Add updated Locaiton hierarchy in search query