added explicit queries and subjects