fix bugs

Fix tax calculating
Fix country code query