Some improvements regarding this are currently being deployed! 🙂