Bulk rename functionality get some small fixes