simplified return logic and add '---' in new post tpl