Change empty queries to null. #433