Minor corrections on index templete and server