Template selection fixed