Fix v5/k5 handling
Port back to using temporary bridge database