Added album filtering