Define 'genre' per file, not per album

[Schnitzler 3]

I recently have come across the following situation: I wanted to listen to dance music, but instead had a lot of hip hop music in my play queue as well.
It seems that a folder with audio files or an album gets matched to all the genres that the individual files in this folder / album are tagged with.

E.g.: Imagine having a compilation with music by various artists. Let's say it contains dance, pop and hip hop titles.
If I now filter my library by genre and select 'dance', currently it seems that the whole album / compilation / folder is added to the play queue, which then consists of pop and hip hop music as well.

I think it'd be beneficial to filter the genres per file / tag, and not the whole album or folder containing a file.