Fix for genre/group with spaces