More tweaks in prefixes feature. #201