Add shallow/deep queries