Added temporary site-url handling; will for now.