FAIMS-259: fixing bug with ordering base layer and non base layers