Fix up filepicker api key abstraction