[#BDKCORE-224] - Fix all fails from EnquiryBundle