Fixed tag index on column and rows, other minor changes