Added validation tweaks and updated average order handling to look into the last hour only