Search is now much faster & code less complicated