fixed issues with non reactiveness due to template structures.