Markers added locally for performance boost
Cleared up New/Old Search integration conflict
New updates