Added specific fields to the queries