Added argument parameters to query
Merged with master