This allows template to work again since we now test the branch when searching for objects. issue #5722
