updated to include more filters