Update for dynamic pull of the preference title, some fixes