Merge pull request #4 from jordandukart/7.x

Change the query type to be ITQL as a temporary fix til we re-write this...
Final UI cleanup before testing and underlying re-factor.