Improve subscriptions hook

Better support for empty objects in subscriptions hook