Removing Regex

The Regex is not as accurate due to things like invalid ids.