changed key fetch logic