fixing bugs, improving Model filtering after client id