* Added more data to search
* Added sorting to search