Fixed minor comments navigation issue
Combined db queries into transaction after syncing