Improved Broccoli query construction using keywords only.