Added filter feature + user search