Fixed some input templates issues