Added angular-scroll and filter option