Fixed bug when used without tags
Revert "Fixed bug when used without tags"

This reverts commit c0587cbf93abf5dde0f34d61449503b72d0dce9a.
Revert "Revert "Fixed bug when used without tags""

This reverts commit 3b597c24cf90030556a9f1f5a74cb3f423c0e2db.