- fixing 'services' href
- adding check for null values