Improved the ID regex