[MODIFY] url expander fixing