improved a bit templates management (side cases)