Story 46080467: refactoring model to use arel 'or' syntax