Merge pull request #567 from farismosman/master

[#1875] Faris | Changed response code when record is created to 201.
[#1875] Machaba/Faris | Added criteria to the enquiry. Code isn't sexy at all :(