Fixing few issues while editing the criteria in the remove tab