Fixed site_id encoding issue