better info window handling