fixed extension
fixed handling of missing keys