working filtering
scrolling behaviour improved