Fixed regex to streamline wildcards