Simplify query language
Add full bundle management
Fix news bundle