Encoding fix

I wasn't able to come up with a working solution with dummy encodings so they're being skipped. I changed the regexp to not match an empty string rather than match a string as I believe it's slightly more performant.