Added query locally, fixed login & signup