Merge pull request #109 from farismosman/master

[#1865] Sync all enquiries -- Loads of refactoring