updated js to include zip filtering and fixed merge issues