Improvements to advanced collection modals
Fix additional foreign key