Initialize queries with empty options by default
Add accessor to query_fields class variable

That should make it read a tiny bit better