I meant the 24h rule as an addition to the current rules (next day OR within 24h), but I havent tried to implement it so I believe you when you say there are more issues!