Small bug fix
Refactored search a bit
Did work on conutry and addressTypes