- moved changes from Friday (stop on empty querries)