Filtering out result a little better