Started refactoring the tag lookup block