fixes post fetchin non-reset issue, modifies some templates