Fix empty AND query