Getting all the search working nicely with the pickers (WIP)