Pass entity explicitly
Fix up Taglist test