(COMMIT-50) AddressController and CommonController refactoring