Fix platform search bugs
Reorient a ton of stuff ~again~ to get search optimal.