support key-id again now with email selector, fixes #7