Fix - Deal with empty tags table