adding back basic filtering
solution for [#2]