[Bug 847498] make raw_id_fields picker actually work

There might be a better way of doing this...