fixing data retrieve job