Minor fixes for queries 4,5,7,8 and 22
Fixed incrementing of s_order_cnt on new order