Fix derivequeries
Merge pull request #259 from rashidkpc/master

Fix derivequeries