Added task type filter and logout function