Separate Rings from Submission Cells

Currently Rings (or POI as they are called in settings, or Pokestops + Gyms if I interpret the data and code properly) are bound to the same query and settings toggle as Submission Cells, it could be helpful to separate these if possible