Please try out the latest Collect beta and let us know whether the improvements we've made are sufficient.