- make expiry query dynamic.