Tweaks search popups, organization page fixes