adding search address by synonym
decorator interface
fix wrong flow