Using all the terms now, and starting to weight them
Generating more complex objects in the query to get ready for the search
Fixed some syntax issues