Improved mapping handling for variants