updated queries conditions