Fixing Add/Edit subscription window