click collect popup n calendar bug fix