Improved OTU mapping behavior (ongoing)