Added the ability to filter the results