updated queries
fixed property