Fix some parameters on search function. Still commented out.