Better tolerance of invalid WHERE statements