[http] Fixes, criteria unification