Added logic to deal with empty values, temp removal of subscribed setting