Change Next / Previous to work with selected Genre

Current behavior is when selecting Next / Previous it changes base on all bookmarks.

Instead should

Change Next / Previous to work with only selected Genre group.

Example; you have a talk radio group and music group.  When going next,  should go to next station in selected group instead of all groups.