added Paul Irish fixes and fixed non index routing
added Paul Irish fixes and fixed non index routing

Signed-off-by: Vince Kronlein <eb3155a7d0da56d0945e171786408bd33cb63253@icloud.com>

maniargaurav/dais,maniargaurav/dais