Fix missing country from API requests
Protect against null values in string comparions
Fix some minor sonar issues
Simplify some methods