Introduced global enquiry flag, so all products get the enquiry action
Minor fixes and tidy