added short cuts string for addresses
no more '-' bug