made search more clean