Fixed migration issue and issue with empty client_sessions result