cleanup code because of options property in Views and improve massive tagging