Additional fixes for Bug 5422, Separate state field for patron's adresses