Add fix and tests for sub title :bug: