[#2863] Fixing some ordering of documents