Change format for sorting/filtering in the future