WIP: Filter the query for list.

#124 
:+1: