Encounter Search merge fix from whaleshark.org CSS changes