Fix overwriting of query.
Add back ignore.
Merge pull request #65 from nZEDb/dev

Dev