added filter and updated user table