Move rest begin/end tags to the right places.
Merge branch '7-autocomplete-fail'