done with the mapping between user,push n pull tables, working on filters