Always add self/collection links
Remove _in_taxonomy in favour of context