Improvements trace id, now without db queries