Fixed bugs around relative site data location