Fixed multiple templates queries