Updated to latest swift version / transition

Last build was for beta 5, beta 6 and current edition broke the
existing code.
Added the start of the transition code from the search page to the
listing page