Readded (but heavily reduced) the single result section (7acc0d2) and changed the order (91a18cd)