#1005 - Fix tooltips not rendering for additional foreign key fields
(cherry picked from commit 63a8dd5)