Completed basic search Functions
Added search to demo form