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