Search fields working, Part B complete