Taxonomy questions

I have some questions about taxonomy and its behaviour in OpenPublish 2.2.
1. I have taxonomy-terms that look like this: A-50. When indexed the '-' is removed and it is stored as a50 in the index. When adding the content the taxonomy-term isn't added to the node. Similar items such as A-375 are added as they should, so it probably has to do with length. I've changed the indexing in search to 2 (instead of the default 3), but that doesn't work. What can be the problem and how can I solve it?

1. When I have related terms in articles and I click these the only nodes returned are other articles (no events, feed-items or other custom types). When I click on other node-types such as events, everything (including articles) are returned. It looks like there is a filter somewhere.

   I fixed it by replacing the following in node-article.tpl.php :
   remove

   <?php
print $related_terms_links;
?>

   and add

   <?php if ($terms): ?>
    <div class="related-terms strong"><strong> RELATED TERMS:    </strong><?php print $terms ?></div>
<?php endif; ?>

   The inserted code isn't the solution though and I prefer the proper way. Does anybody know how to do this?