Handle services without division by zero when data is missing
Added basic reordering