Better check for tab link

Fixes #263
Fixes #264