Fix query on comparison table and delay format