Isolate object names from the database with a <bdi> tag

Fixes #743