Less queries, CSV upload error handle, fix update product