[#1875] Machaba/Faris | Added criteria to the enquiry. Code isn't sexy at all :(
Merge pull request #569 from farismosman/master

[#1875] Machaba/Faris | Added criteria to the enquiry. Code isn't sexy a...