BVAL-322 Fixing some wrong listings