Optimized the queries a bit more since I realized I was doing some unnecessary
things given the isolate_selection table