TwD fixed search to the base template