Change method that generates path to include site id if present