Arel'ing some of the OR logic