Fix Where and Like combined queries