DEVIDM-106: Restructured & corrected some queries.
Merge pull request #56 from iceglow/DEVIDM-106

DEVIDM-106: Restructured & corrected some queries.