fixing /zero hover dependency, and expiry logic
