Use text/value instead of title/pk