Fixxed multiple issues in goi template