Remove join with country table, some refactoring in address.js