[apartment] Improve patrol-apartment plan