fixed some find issues with Templates