search && cosmetical changes