Some beauty
'Refactoring'
text tag search; merge