Changed functionality of search