Remove potentially problematic query