Convert more 'conditions:' to stabbies on has_many