fix edit and custom tags bugs