Fix person search for multi site
Fix template switching issue