further lavida regex fixes