Move function declaration to match results order
Display fixes