Date trigger performance fixes