Fixing path setting for non-routes

Change-Id: I55ad5c6fb96b54da7d4c5a123a8fe49de9e89877