reapply 37d786c which was reverted by 3ed3d5a
fix #402; adding extra line to faq sections and faq questions; make order work
refactoring