[3.7] Fix #1111 sub views substitution is broken