Add Query struct for nicer-than-SQL query API
Forgot not equal operator
Add local components