Fixed index url mapping
Merging with views fix