added a check for the remove button to not repopulate from the DB as well, see last commit