Add filter box
Combine the two queries into one using left join