Fix up Activity feed sorting and conditionals, a bit rough but good enough for now