updated @if @else handling, component.json & spec requires