fix table odd-even; fix to reduce db query
mege with remote