Changed xsl to check short-cuts