Added handling for <else> tags