ARQUIDEAS-1652 # IE fixes