Added smart loading for comments