Now saving location in session and filtering threads correctly