Added some stuff for the basic search