fix last seconds whitespaces and api order