added: search
merge changes