SAPI-247: Make sure we fill the correct service types