Fill column and edit-server improvements