Updated to make search functional.