filter added
few minor tweaks