removed clip and added query