xhm-extract-url now take single quote too. and other changes