MapSearch Work

-Merged current map search work into main branch
-Moved all mapsearch beta work to beta files and flags
-Added map search beta flags
-Tested build (all good)