#833 - Improve foreign key dynamic fields interaction on site