Find with params and fix others features :+1: