Add select_related() to prevent additional field lookups
Change instance.choices from property to method

This was changed in cbmi/avocado@2312647