fixed OR conditions so return AR relation without doing anything weird