Fix partial matches in regex
andi wip