Update active record scopes to return actual scope object instead of hash