WIP - fixed urls and domain argument for view