Query helper sameup and delete function removed