Api tags

FIXED: coverage thinks it is missing 1 branch. see comments.