Added the ability to search based on the model