Rewrite block under player search

Should be faster
Highly experimental