Small fixes and rename of unique_id_for_useг.