modified queries, added additional options