Use original string as fallback in case of regex mismatch
Make regex a bit more robust