PR Fixup: Use suggested text
PR Fixup: include all fields in error text
PR Fixup: fix key error
PR Fixup: Use simpler selector