FIX Use Entwine instead of Live-Query