Fixed  bugs with popup, improvement to collection auto-update