Search Logic cleaned up a little bit. Eliminated extraneous regex from Search URL.