Moved 'with tags' in to the if statement