subscriptions && js fixes