Moved 'with tags' in to the if statement
Moved 'with tags' in to the if statement