Add support for has_one with assoc selector