Re-added/Fixed support for comment titles