FriendlyId 5 Support

Quick Fix until a better solution is provided