Fix: Avoid using date_format