Split raw_data to a new model
Improve search box