Don't use one giant regex to find refs
Fix handling of 'Other' categories in texts list