@mattdrayer do we want to filter start/end dates if they are set to None?