FIX better options matching