fixed signup and search
merge Search into master