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

...t all :(