Changes done to get custom fields attached to cureent template only