Tag & search js cleanup