Fixed parsing order
Added fade to target switching