Improve mappings for ctrlp tags

Fixes #16