New commit from production

Includes my workaround query for Difficulty in HAG box on hike posts.