improve benchmark and query1 + add query19