fixed NOAPIStore bug and model relationship